travis: Add some libsodium coverage

As far as I can tell we're not gating on this right now.  From
a quick glance, it looks like Debian stable has `libsodium-dev`
but only Ubuntu eoan does which we're not testing right now.

diff --git a/.travis.yml b/.travis.yml
index a77bf827fa46ed3f5031f1208076eca98738adf4..227ad4b3f75b1b31db2c5daaefa24e2a4176638b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,9 @@ dist: trusty
 sudo: required
 
 env:
-  - ci_docker=debian:buster-slim ci_distro=debian ci_suite=stretch
-  - ci_docker=debian:buster-slim ci_distro=debian ci_suite=stretch ci_configopts="--with-curl"
+  # debian has libsodium-dev, ubuntu doesn't in core at least
+  - ci_docker=debian:buster-slim ci_distro=debian ci_suite=stretch ci_configopts="--with-libsodium" ci_pkgs="libsodium-dev"
+  - ci_docker=debian:buster-slim ci_distro=debian ci_suite=stretch ci_configopts="--with-curl --with-libsodium --without-gpgme" ci_pkgs="libsodium-dev"
   - ci_docker=ubuntu:xenial ci_distro=ubuntu ci_suite=xenial
   - ci_docker=ubuntu:bionic ci_distro=ubuntu ci_suite=bionic
 

diff --git a/ci/travis-Dockerfile.in b/ci/travis-Dockerfile.in
index df999e785d6cb41cc50046062aa2da53d9415c74..9e47876e79f17733464ce5454a88d14435e4f79b 100644 (file)
--- a/ci/travis-Dockerfile.in
+++ b/ci/travis-Dockerfile.in
@@ -2,7 +2,7 @@ FROM @ci_docker@
 ENV container docker
 
 ADD ci/travis-install.sh /travis-install.sh
-RUN ci_suite="@ci_suite@" ci_distro="@ci_distro@" ci_in_docker=yes /travis-install.sh
+RUN ci_suite="@ci_suite@" ci_distro="@ci_distro@" ci_pkgs="@ci_pkgs@" ci_in_docker=yes /travis-install.sh
 
 ADD . /home/user/ostree
 RUN chown -R user:user /home/user/ostree

diff --git a/ci/travis-install.sh b/ci/travis-install.sh
index 8992aed0e168d286d74692f3c9dbd9634455c8e6..b455fd3e5d902b02c8285daac6a1cf334b72000e 100755 (executable)
--- a/ci/travis-install.sh
+++ b/ci/travis-install.sh
@@ -64,6 +64,7 @@ if [ -n "$ci_docker" ]; then
         -e "s/@ci_distro@/${ci_distro}/" \
         -e "s/@ci_docker@/${ci_docker}/" \
         -e "s/@ci_suite@/${ci_suite}/" \
+        -e "s/@ci_pkgs@/${ci_pkgs}/" \
         < ci/travis-Dockerfile.in > Dockerfile
     exec docker build -t ci-image .
 fi
@@ -111,6 +112,7 @@ case "$ci_distro" in
             procps \
             zlib1g-dev \
             python3-yaml \
+            ${ci_pkgs:-} \
             ${NULL}
 
         if [ "$ci_in_docker" = yes ]; then